Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 14 Jul 2011 20:40:35 +0000 (13:40 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 14 Jul 2011 20:40:35 +0000 (13:40 -0700)
commit9c57d3672a825345dbf72712e2cd470efcc346ed
tree5b0bee98296cb91ad447c4479680f7853091462b
parent55a2374c147c1bf0131345d3292d997a1fddbe9e
parentb7f3a8617ae4fb1efb7736a219a082c0f5ea8e86
Merge from trunk.
src/ChangeLog
src/dispnew.c
src/keyboard.c
src/xdisp.c